]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
st/entry: Don't set font twice on style changes
authorSebastian Keller <skeller@gnome.org>
Thu, 29 Oct 2020 19:59:21 +0000 (20:59 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Wed, 18 Nov 2020 20:26:53 +0000 (21:26 +0100)
Setting the font is already handled by _st_set_text_from_style() since
be76b19300.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1489>

src/st/st-entry.c

index 043be6a7cce6d84d71cf72f7445eda13c95d4e25..a8edb2de4d7606865877fff66b73f16ecfa86c2a 100644 (file)
@@ -243,8 +243,6 @@ st_entry_style_changed (StWidget *self)
   StEntryPrivate *priv = ST_ENTRY_PRIV (self);
   StThemeNode *theme_node;
   ClutterColor color;
-  const PangoFontDescription *font;
-  gchar *font_string, *font_name;
   gdouble size;
 
   cogl_clear_object (&priv->text_shadow_material);
@@ -265,15 +263,6 @@ st_entry_style_changed (StWidget *self)
   if (st_theme_node_lookup_color (theme_node, "selected-color", TRUE, &color))
     clutter_text_set_selected_text_color (CLUTTER_TEXT (priv->entry), &color);
 
-  font = st_theme_node_get_font (theme_node);
-  font_string = pango_font_description_to_string (font);
-  font_name = g_strdup (clutter_text_get_font_name (CLUTTER_TEXT (priv->entry)));
-  clutter_text_set_font_name (CLUTTER_TEXT (priv->entry), font_string);
-  if (strcmp (clutter_text_get_font_name (CLUTTER_TEXT (priv->entry)), font_name) != 0)
-    clutter_actor_queue_relayout (priv->entry);
-  g_free (font_string);
-  g_free (font_name);
-
   ST_WIDGET_CLASS (st_entry_parent_class)->style_changed (self);
 }